Controller Fix