Fixing issue #7