Fixed controller bug