Fixed hasEnded #40 #42