Fixed JSON marshalling