Fix 1
Fix 2