Fixed ArrayOutOfIndexException