Fix for Issue #10