Better ZDE handling.