* aggregate: Only save state if it was already loaded. This didn't used to