IN-314 - Fix incorrect timestamps