Fix for Issue #2