fix multiple removal bug