Fixed recent BC break