Fixed a bug with the last commit where nontbd wasn't being run correctly.