Really fix Z order of exit