Fix distribution match statements