Reset states: now two variants, see #52