fix unconsistend capability creation and removal