Fixing issue #7.