Fix oscar overriding issue refs #22158