Small improvement to viewer.