Rethink max timestamp