Fix: `best_of` flag was not being updated properly