fix controllers to work with last changes