fixed #654