New try to fix viewport