Applied patch to fix a unicode related issue in the watch program