fix #680