Proposed solution to the issue #136