Fix answer logic