Fix for rare issue with tuning override