fixes #6585

fixes #6585
done