Proposal to fix Issue #2305 (V3.9)

Proposal to fix Issue #2305 (V3.9)