Fixing message responses.