Fixed Remove issue