+ Fixed question generation