fix #1484