Fix subst of SOne