Horray! Fixed controller bug