fixed kvp serialization