Fixes #670.
Merge pull request #673 from kwhatmough/next

Fixes #670.