Attempt to catch more TV.
Merge pull request #437 from nZEDb/dev

Attempt to catch more TV.