Merge pull request #1490 from seanpaultaylor/next

Next
Fixes #1466.