Unifier fix