Correctly count the graph width. Closes #18