Make vsys serialization safer