More bpm fix