Fix 2.3 issue