watch restart bug
better message format