Correct failure of ORG to update the current location counter