Very small change for the new controller