Fixed Viewer class.