Really fix 23.4 compat