Alternative Options for #622807