Proposal to fix issue #2305 (V4.1)