Fix for Issue #116