Fix proposal for issue #128