Fixed bug in unmarshal json