Alternative Options for #1155809