Make "dont_save_answers" option work properly