fix for correct final timestamp