* finish task #1607.