Fix for Issue #29