Fix 4-6. Fix other as well