json serialization fixed