a quickfix for the @token infastructure