Fix issue with removing