Fixed indexing issues with battle items