Fix for last half 7
Fix 8,9,10,12,13,14,15,16