Fix PR4909, patch by Jakub Staszak.