watch; fixes #18