fix #1091 #1053