Fixed timestamp normalization bug