This may fix mantis #7200, but I am unable to test because I don't have any old viewers around anymore.