fix issue 4040