Fix timestamp problem