fix #608