Attempt at better TV image  handling