Fixing issue #9