fix #1454