Fixing issue #6