This seems to be fixed.
I tested standalone.
Testing as part of a pkgs/ build still needed to confirm 100%.