Controller Fix 2