Fixed removeItem