Fixed the merge so that the time is properly loaded from the model.