Merge "fix the judgement condition"