Fixed issue with incorrect timestamps