reinsert token, issue #129