Fixing controls timeout issue