Fixing component deletionissues