Fixed indexing yet again, placement performance fix