should fix #6065