Timestamps fixed