Fix issue from merge