Partial fix for Issue #7