Fixes a timing issue with the core data provider