Alternative Options for #820825