Fixed convert to json format