Fix view returns