Fix chaining
1.1.7