Correct env serialization