Fix for botched BPM calculations