Updated that fixed an index out of bounds crash