* adjust code for task #1802.