fixed TimeStamp issues