fixes #5806
more fixes #5806