Use separate watch task, to work around inject issue