Partially fix #13566