Zone generator fix