Fixing Issue #89
merging
Updating fix to issue #89