fixed the question handler