Bugfix: remove didn't work