Fixing MultiFormObjectDecorator to work with SS 3.1