Feature/controlled set fix

Makes QA on sets work again. (incidentally) Closes #299.