Fixed infiniteDataSource