Viewer: bug fix