fix #1412, #1552