fix #41 #42