fixes #6176 Problems after make the upgrade