Proposed fix for Issue 56

Proposed fix for Issue 56