fix #954