featue #1739: Minor modifications