Simplify chain
Merge pull request #1691 from megawac/chain

Simplify chain