subject says it all Reproducible: Always
Tested it and got it working. nixnut agreed we could fix this ourselves.
And done here, too.