Alternative Options for #1059807