Fixed index out of bounds exception