Fixing Issue #39