Fixing Issue #47