Proposal fix for issue #10108