Should get rid of index oob error