Fix 7&8