Fixed #40 #41