Hopefully fix #7096812604762