fix #960