Quick fix for Issue #1