Fix minor issue from previous merge