Fix off-by-one timing error when BPM changes