Alternative Options for #946567