Fix calling handler match twice