* adjust code for task #1794.