Fix bug where we clobbered old state group values