Alternative Options for #551655