Fixes another issue with watching