Json (de)serialization - fixed