Update #5 - Fixed removal bug