Alternative Options for #1055586