Fix for Issue #1