Fixed the controllers