fix issue 2309