fixed #680