Fix a typo in previous merge