Fix the controllers definition