fix issue 1498