fix #628