Own channel watch bug fix