Created attachment 121411 [details] [review] Possible fix Please try the attached patch if you have time. Completely untested (not even compiled), but should do most of the trick. Need to check in detail when I'm back home.