re-added cyclic dependency for now