Fixed Request-Token support