Proposal to fix #23