Fix timestamp mixup