fix #614