Alternative Options for #713528