Fix bug with keep-alive, watching optional, 0.2.2