Add compatibility code to support unidentifiable controllers