Fix remove volunteer bug