Avoid BC break