Fixed loading bug to do with timestamps