fixed final states being added twice