further improvement for ticket 21006