fix issue query