fix #1054