Migrate to CBV fix