Fixing issue #6.