fixed #610