Fix next block bug