added token overlap fix
merged with master