Better escape/view fix