Fixed removeById bug)