Fixed question checking issues