It is a fix. Doesn’t require covenants and is already well developed and being merged into wallet software. Will be a standard sooner rather than later.

https://youtu.be/z-NSyfBilyY?si=iMIzVjdzb-gIHGpF