New partial block handing to improve robustness