Avoiding Cross-Chaining