fix #1530