Broken controller fix