Trying to fix a circular dependency