Fixed issues with TimeMaps created by the refactor