Fixed #72 - handling TVs