messaging fix