Not required, but cleaner - #41, #42
State change wasn't detecting pid change - #41, #42