WIP introduced some limits before the upgrade