done enhancement as given in TICKET #1191