Issue #2271307: fixed advancing a question too far