fix #610