Re-Add ZTA and ZTB check