Fix 1 of 2
Fix 2 of 2