Alternative Options for #1119069