Fixing issue #5308