Fix after refactoring for views