Fix time tracking on map change