Fix bug for "if" and "while"