Fix controller for first found ID