Fix broken composition picking