r11336: Start to get my control back :-). Volker, I think