Fix 2.3 crash