Fix 2.6 dev