Templating watch fix.