Fixing issue #5