fix #643