Quick-fix for Issue #12