RPV 205 - Fix to show generics
RPV 205 - Fix to show generics