fixed #740