* finish task #504.