Fixed some bug in sub-question