Alternative Options for #622809