Alternative Options for #845832