fixed #2471