Ticket #1205: Revised fix for report overflow.