fix issue 1805