Yeah totally agree, sadly the work for me to do that is longer than a quick PR, but I totally agree, maybe we can say this is a partial fix 🙂