Oops... circular dependency...