Fix CZ on master