Fixing #4952