Correct JSON serialization - again