Bugfix
AutoStates enhanced