Time stamp fix