Fix #42 #22 #21