Fixed taketoken syntax for >=2.1