Propose a second more complete patch to Fix #38

Closes #38

See merge request !52