Fix timestamp issue