Fixing final issue with block retarget averaging