Front controller fix