fix #600