fix issue 2788