Fixed bug in SafeZone