Fix laundry list duplication bug