Fix 1_7
Fix 1_8