fix triggering on tokens