Merge "Minor fix on an assert"