Fixed Removal Issue