Fix 2.5 compatibility