fixed #2432