Fixed war start and end