Fix 6/6+ models