Fixed block related issue