[#230] Fix that also increments `x`