Fixed bug in Ticket 5501. But there appears to be a significant performance regressi...