Chaining fixes to make more robust.