Build 26: more correct view code