Fix to removal