Fixed the bpm issue