Added another check for safe zones.