End timestamp fix 2