fix #1358