Fixing issue #4.