Fix: Loop in driver selection routine