fix mapping to json