Fix to avoid using controllers