Further Issue #106 fix