Alternative Options for #1084348