No longer goes into undefined land at the end