fixed #648