+1 commit. one bug in remove is replaced by another bug!!!