Fixed a couple of out of range branches