Wip 7064

Fix for issue #7064