Added immediate checkpoint to avoid unnecessary re-scan of buffer upon buffer overflow.