Alternative Options for #812529