fixing question flow