fix #42 #43