Possibly fixed a bug with scope numbering