Fixing issue #9.