Actually resolve circular dependency