Fix 3 way calls