Bug #18231 - Apply fix from Dyonisius Visser