Fix 23.4 compatibility