no more infinite watch loop