fixed #635