Fix for Issue #139