fixing issue #26: KEYVALSET does not "end"