Circular dependency, ufff... I don't like it