fix off by one leading to invalid host stats tree
Merge branch 'master' into portable