Fix 2.6 compatibility