Fix for ticket 22511