Fix an issue with view logic