Fixes 9974

BS3 commit c429fd1a3c2bb3f08c031d37050b2e83186d8b16