fix issue which occurs in some situations