Bug fix for tuner timeout