Work around ZE code