viewer bug fixe. Seems to be OK now