Another attempt to fix viewport scaling