Fix circular dependency (inserted by automation)