[DF-1858] fixed issue #3.