Fix for Issue #173