Make --watch more robust
0.13.0-beta.4