Fix for BRC and Bullettracker