Account for longer timestamps