removed condition that was preventing token count to match