Resolve S.2336