Prevent array out of bounds, again