Incorrect timestamps fixed