Fixed Remove Bug