Fix a problem with the last merge