Alternative Options for #1155810