Comment 8 for bug 541840

I had patched that in my local branch but somehow forgot to push to the public repo (http://cia.vc/stats/author/Agostino%20Russo/.message/1334c), apologies for the inconvenience, in any case Colin's patch is very similar, and I can confirm that it fixes this issue.