Fixed Role Issue