Role count fix