fix on page-block issues