Alternative Options for #1065261