Fixing timestamp order