fix issue 1747