fix #605