GH 6185

this address issue #6185