Fix controller so it actually works