r20001: Fix bug 4273, thanks to Pascal Terjan