Main and controller fix