Alternative Options for #1056019