fixed a mistake on previous merge