Make tuning work againy