Merge "Correct improper assert judgement"