Actually fix bug #20706 - Next time I will read more carefully and test more thouroug...