Fix blocks retrieval.