Fixed block editing Issue