Fixed question generation, I think