fix: improve block fetch logic

fix: improve block fetch logic #47