* finish task #2161.