Bugfix tv view