Alternative Options for #939854