Fixing Issue #97.