fixed tstamp issue