fixed #22 TimeStamp missing