Merge "composer: Fix corruption issue due to wrong index"