Fix 2.3 compatibility