Fixed re-index on remove