futher fixing state from revert