Main controller fix