Should now be a non-issue given the refactor.

Done.