Digi : fixing removing of state