should fix #9047