Fixing timing bug.

No serious inaccuracy it seems but does not account for graph creation.