Fix the dodgy Wartown fix