Proposed fix for Issue #1

Please ignore this pull request.  It does not resolve the issue completely