Fixes: Watch broke on refactoring #34

Closed laurisvan closed 9 years ago