fix issue with which message we are passing to the backend API