- fixed json serialization