This should (hopefully :-) be the final fix for the %U %G substitution