Fixing issue #3