Fix 1.7 loading