Fix watch file issue