Fixing Issue #67