Correct the API to correspond at the original message