BUGFIX new states accounting for max instances