Allows everything to work with watch task - Fixes #62