Unification fix