fixed #628