Fixed buffer-stop numbering problem