Bugfix as a relic of the refactor.