another fix to state2