Fixes #16; needed to use remainingVariables in PICK_CONTROL as had already been used in ADD_CONTROL