fix #43 #44