Fixed the JSON marshaller