Partial fix for Issue #2