Fixed a bug in per RP token type handling