Fixed removeListener