view fix - untested yet