Valid bounds fix
Merge branch 'master' into multiplayer

* master:
  Valid bounds fix