Avoiding future breakage