fixed #2259