Alternative Options for #1182030