Comment 4 for bug 1144465

nicolai I hope you don't mind, but I committed a quick fix in the linked branch.
Your review for merging this will be very welcome as you seems to know better that part of the code.