Fix handling answers