Additional fix for array out of bounds crash.