Fix to avoid adding to immutable lists