Fix TimeStamp usage