Fixed removing of component