fixed #621