fixed up unification