Fixed event on duplicate token bug: t+