setWatch issue

Thanks @Gordon! I'll flash the bleeding edge firmware and give it a go, and report back.

I thought the flip flop solution inventive, but certainly am not interested in the flying chip circus longer term :-}