[Form] Fixed stofs from #7878