Fix for ticket 10036.