Fixes #1533
Merge pull request #1543 from seanpaultaylor/next

Fixes #1533