[DF-1858] fix for issue #6.