Alternative Options for #1155808