fixed #606