Partial fix for Issue #1