Hopefully fix #7549