fix for 'collection changed' issue at startup