fixed removal issue