Fix ZoneFactory BC break