[McDonalds] Proposed workaround to avoid CollectionChanged exception