Fixed bug: rh was generating tokens