fix #1036