Fixed role issue