Fix for remove data