Fix role issue