WatchFrame bug fix