Alternative Options for #641282