Avoiding late changes