RFE#919 Improvement.

RFE#919 Improvement.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>