Fix a bug with the previous merge