Fix: save state when marking setup