Fixed major ID conflict issue