fixed set creation and deletion