fixed base controller inclusion