Fix: bug due to non complete removal of a buttonset.