additional fix for issue 6711