Last view fix