Small bug of "sub" bnf is fixed.