diff --git a/src/controller/genericmidi.cxx b/src/controller/genericmidi.cxx
index b729678..78ca8b3 100644
--- a/src/controller/genericmidi.cxx
+++ b/src/controller/genericmidi.cxx
@@ -547,7 +547,7 @@ void GenericMIDI::midi(unsigned char* midi)
 				break;
 			case Event::TIME_BPM:
 				// FIXME: quick-fix for "ZeroOne" type value -> BPM range
-				jack->getLogic()->setBpm( value * 160 + 60 );
+				jack->getLogic()->setBpm( value * (MAX_TEMPO - MIN_TEMPO) + MIN_TEMPO );
 				break;
 			case Event::METRONOME_ACTIVE:
 				jack->getLogic()->metronomeEnable( b->active );
diff --git a/src/timemanager.cxx b/src/timemanager.cxx
index 1a262d3..60bc9b2 100644
--- a/src/timemanager.cxx
+++ b/src/timemanager.cxx
@@ -82,7 +82,7 @@ void TimeManager::setBpm(float bpm)
 
 void TimeManager::setBpmZeroOne(float b)
 {
-	setBpm( b * 160 + 60 ); // 60 - 220
+	setBpm( b * (MAX_TEMPO - MIN_TEMPO) + MIN_TEMPO ); // 60 - 220
 }