Accommodate canberra mode