Fixes. BSet remove that doesn't work