Preserving the two-state solution