Suppose this change is more fair...