THis fixes #7734.