Fixing Issue #116