Does this change belong here?