fixed removal bug