Fixing issue #4