Fixing chaining test.
Merge branch 'chaining_fix'