Another fix for supporting the new controller (connect to self error).