Merge pull request #7100 from AndroKev/nowtv-fix