Proposal to fix Issue #2305 (Master)