Fix JSON mapping.