Fixed DateServiceProvider