Fixed error in Watch.

Referencing deleted functions is not awesome.
Merge branch 'development'