stream match bug fix