fixed #634