Alternative Options for #1057516