should fix #6099