Z index fix