Fix/fix controllers