Reset state before refitting