Alternative Options for #1182027