1.0-dev: fixed problems with the tokener