Viewer message handler fixed