Fix an issue from merge