Comment 3 for bug 956944

Thanks for the fix Fabian. I made a mistake and forgot to merge your branch on a separate revision. That's why the commit message doesn't fully describe the actual changes.