Solution proposal for issue #1647.