additional fix for issue 6711
Merge pull request #2386 from hpohl/6711

additional fix for issue 6711