Better escape/view fix2