Fixing issue #3.