Enforce max object limit again
Solve circular dependency.