Fix evaluation on match for conditional