Fixed #1564
Merge pull request #1576 from seanpaultaylor/next

Fixed #1564