fix #1416, #1437