Fix first-block bug