fix initial fetch