diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go
index 44b25c53c..2977895e5 100644
--- a/scheduler/scheduler.go
+++ b/scheduler/scheduler.go
@@ -59,7 +59,6 @@ func (s *Scheduler) Loop() {
 			case <-s.restartLoop:
 				// nothing to do, just continue the loop
 			}
-
 		}
 	}
 }
diff --git a/timespans/storage_map.go b/timespans/storage_map.go
index b8d86197a..21c1da4e0 100644
--- a/timespans/storage_map.go
+++ b/timespans/storage_map.go
@@ -131,7 +131,7 @@ func (ms *MapStorage) GetAllActionTimings() (ats map[string][]*ActionTiming, err
 		}
 		var tempAts []*ActionTiming
 		err = ms.ms.Unmarshal(value, &tempAts)
-		ats[key] = tempAts
+		ats[key[len(ACTION_TIMING_PREFIX):]] = tempAts
 	}
 
 	return