Finally properly fix the zones