fixed #664