Fix error with token generation - error investigate over