Fix off by one error or legacy view