Working on resolving a name error.
Bugfix.