fixed #644