fix for issue #7245