Proposal to fix Issue #2305 (V4.0)