fixed #627