Fix compilation issue from merge