Fix my previous merge, due to renaming in next.
Merge pull request #957 from kwhatmough/next

Fix my previous merge, due to renaming in next.