Second patch attached as promised...

Best, /PA