Fixing issue #8