Alternative Options for #638975