Fix resetting some more