fix block management