Alternative Options for #1050927