proper reset of state upon enter