Merge pull request #436 from ttsugriy/next

Fix bug in option propagation.