why is this not the default? since you're adding it everywhere...
Fixing the circular dependency can fix this.