fixing issue #7073