Fix for Issue #12