fixed: code unification