Correctly account for aligned blocks