I made this change on merge.