Proposed fix for issue #66