fixed issue 1677