Fixed #41 #42