fix client_on_message, FIXME for bug with channels