Fix adding new mode name conflict