Now handlers are disposed correctly