fix #621