fix for statements and subquestions