Fix handling of answers.