Card #48 fix bug spotted by JR for RoleId