Fix view generator