Fix controller detection race