fix #1505