fixed #605