Fix BC break