Fixed: IndexOutOfRangeException