Bug 124

This fixes viewer bug. Looks good to me.