Alternative Options for #1064522