Fixed the controller