proposed fix for Issue #136