JSON serialization fixed