fix to tvserver