fixed #620