fix broken things in watch decorator