Fixed controller bug!