Fix integration where new controller returns a ptr to an underlying controller