Partial fix for Issue #12