Properly fixed the ZoneManager