* finish task #1941.