Fix for BPR