More robust tuning