Alternative Options for #1043017