fixed #629