Fixed question handling