Fix for indexing issue on remove