fix #648