fix timestamp issue