fixed #678