fixed timestamp issue